Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Mar 2011 06:26:47 +0000 (22:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Mar 2011 06:26:47 +0000 (22:26 -0800)
commit754bef2858dc438c961156e979ed666d5cdea443
tree314737a82e27e11ea81eb7f4731b897587d8eac0
parentab50299a7d07b97f6ec8f8fd0a2d022338b88c70
parent4ad8c2d105279527adda32a9bb31fa1ad2826bee
Merge from mainline.
src/ChangeLog
src/xdisp.c